From: Raspbian automatic forward porter Date: Mon, 11 Oct 2021 20:44:50 +0000 (+0100) Subject: Merge version 1:9.0.1-16.1+rpi1 and 1:9.0.1-20 to produce 1:9.0.1-20+rpi1 X-Git-Tag: archive/raspbian/1%9.0.1-20+rpi1^0 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ff0fb4879b8d971e7284638b1a5616f9f8fa5c8a;p=llvm-toolchain-9.git Merge version 1:9.0.1-16.1+rpi1 and 1:9.0.1-20 to produce 1:9.0.1-20+rpi1 --- ff0fb4879b8d971e7284638b1a5616f9f8fa5c8a diff --cc debian/changelog index 0d323e538,cbf4da7cc..af9ae828d --- a/debian/changelog +++ b/debian/changelog @@@ -1,44 -1,22 +1,60 @@@ - llvm-toolchain-9 (1:9.0.1-16.1+rpi1) bullseye-staging; urgency=medium ++llvm-toolchain-9 (1:9.0.1-20+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green at Sat, 14 May 2016 21:43:35 +0000] + * Cleanup .pyc files in clean target. + * Add a hack to the cmake based build to force armv6 (unfortunately the cmake + based build relies on config.guess which assumes you want to build for the + hardware you are running on). + * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that + are broken on lower arm architectures. + + [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green] + * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously). + * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake + * Clean up debian/usr in clean target. + * Clean up clang/tools/*-3.9 in clean target. + * Clean up stray *3.9.vim files + * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc + * Clean up debian/*.install + + [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green] + * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain + about it not existing. + * clean up more crap left behind by build process. + + [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green] + * Remove debian/man in clean target. + + [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green] + * Use libatomic on armhf + * Set cmake/config.guess.hack back to mode 644 in clean target to keep + git/dgit happy. + * Yet more clean target fixes. + + [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green] + * Change triplet in debian/rules to use armv6k rather than armv7l + - -- Raspbian forward porter Sat, 07 Aug 2021 04:32:47 +0000 ++ -- Raspbian forward porter Mon, 11 Oct 2021 20:44:48 +0000 + - llvm-toolchain-9 (1:9.0.1-16.1) unstable; urgency=medium + llvm-toolchain-9 (1:9.0.1-20) unstable; urgency=medium - * Non-maintainer upload. + * Add missing part of patch + + -- Gianfranco Costamagna Mon, 27 Sep 2021 17:53:42 +0200 + + llvm-toolchain-9 (1:9.0.1-19) unstable; urgency=medium + + * Add two patches from ubuntu to fix lto and gcc-11 build failures + + -- Gianfranco Costamagna Mon, 27 Sep 2021 15:39:19 +0200 + + llvm-toolchain-9 (1:9.0.1-18) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * Cherry-pick nmu again. (version 16.1) + * bump minimum cmake version on qualify-clang.sh too + * simplify cmake test without minor version + [ Andreas Beckmann ] * clang-9: Drop Recommends: libomp-9-dev which is not co-installable with libomp-11-dev (and libomp-dev) for smoother upgrades of libomp-dev from buster to bullseye. (Closes: #990452) diff --cc debian/patches/series index 98d36074c,cb53c3fe6..1fcff50a2 --- a/debian/patches/series +++ b/debian/patches/series @@@ -130,4 -156,7 +130,7 @@@ f8e146f3430de3a6cd904f3f3f7aa1bfaefee14 # bug 974779 llvm9-D71443-PPC-MC-redef-symbol.patch llvm-9.0-D78196.patch + remove-cyclades.diff + D99501-ignore-lto-auto.diff + fix-missing-include-limit.patch +raspbian-triplet.patch diff --cc debian/rules index 6573b1b68,03b7641dd..a6a54b6a8 --- a/debian/rules +++ b/debian/rules @@@ -297,13 -304,9 +304,15 @@@ preconfigure @echo "DISTRO=$(DISTRO)" @echo "GCC_VERSION=$(GCC_VERSION)" @echo 'PROJECTS=$(PROJECTS_LIST)' + @echo 'LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)' + @echo 'CMAKE_BIN=$(CMAKE_BIN)' + # add executable flag to script we added as part of triplet hack + # --plugwash + chmod 755 llvm/cmake/config.guess.hack + # also make sure config.guess is executable + chmod 755 llvm/cmake/config.guess + for f in debian/*.in; do \ f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \ echo "$$f => $$f2"; \